Merge pull request #41 from stephandev/master

Added procedures.
Merge pull request #42 from stephandev/master

Avoiding merge conflicts.
Bug fixes
Merge pull request #92 from mshamash/master

Bug fixes