tomroh Merge pull request #25 from tomroh/development