Other new attempt 2
Merge pull request #2 from testme2014/master

what is going on?