Some bugs fixed
Remove source
Bug fixes
Merge pull request #30 from edin5/master

Design update