mulander Merge pull request #14 from niamtokik/master …