#56 done
#53 done.
#54 done.
#55 done.
Merge pull request #57 from fotavo/bugfix

Bugfix