more stuff
Merge pull request #4 from csalajan/master

more stuff