Merge pull request #3 from thearn/develop

small changes for code cleanup / efficiency