Bug fixes - release 0.2.1 [skip travis] Bug fixes - release 0.2.1 [skip travis]