Addition

Adding methods. Minor bug fixes.
Merge pull request #6 from Orasi/Adam---Toolkit

Addition