Merge pull request #1 from mkobar/master

initial checkin