Merge pull request #1 from unbalancedmind/master

first merge
Merge pull request #2 from unbalancedmind/my_branch

Merge pull request #1 from unbalancedmind/master