fourth commit
sixth commit
Merge pull request #2 from neenurose/master

two commits