Merge pull request #5 from madflojo/develop

Minor bug and update