refactor
Merge pull request #2 from icholy/master

Some ideas