Merge pull request #1 from unbalancedmind/master

first merge