Merge pull request #8 from sgade/master