Some improvements
added idea TODO
Merge pull request #25 from anryko/master

Some improvements