Merge pull request #6 from osteliost/master

ost