My initial take
minor fixes
Merge pull request #2 from sinan/master

My initial take