Bugfixes.
Merge pull request #57 from ovidiuiliescu/master

Bugfixes.