Merge pull request #2 from shadym/master

ATM