Tagging

This has been fixed on the issue-6 branch. Im just waiting for the tagging branch to be merged so i can merge master into issue-6 and then push issue-6