Updated information.
Updated description.
Merge pull request #38 from simplepanda/devel

Merged devel to master.