Merge pull request #47 from freedomofkeima/master

Minor features fix