Some improvements, some new functions
Merge pull request #1 from icanprogram/master

Some improvements, some new functions