Fixed bugs
Merge pull request #47 from Garffan/devel

Fixed bugs