Merge pull request #31 from clandmeter/master