Bug fixes
Merge pull request #1 from dadisn/0.5

Bug fixes