Fix problems
Add somethings
Merge pull request #38 from Garffan/devel

Devel