Merge pull request #58 from psyke83/master