Merge pull request #111 from tkrille/cleanup

Cleanup
[cleanup] organized imports