ceronman Merge pull request #6 from carlsverre/master