some_updates

Some Updates
Merge pull request #36 from tintinboss/some_updates

some_updates