Merge pull request #19 from Auv5/master

Taking the safe option (TM) for competition.