10-22-14

Commit in order to merge with master branch before working on more
features