more sane way
Merge pull request #46 from psichi/develop

more sane way