fix some problems
fix some problems
Merge pull request #19 from seyon/develop

Develop