Merge pull request #6 from spokkal/master

pulling from master to s