Fixes #2

Bug fixed #2
Fixes #7

#7 fixed
Merge remote-tracking branch 'origin/dev'