Merge pull request #5 from noodlehaus/develop

moved to 5.4, shorter func names