Bugfix and improvements
Merge pull request #21 from onelight-studio/bugfix

Bugfix and improvements