Bugfixes
Merge pull request #20 from yectep/ytdev

Bugfixes from previous