Merge pull request #12 from vanfanel/master