Made some updates: Moved indexes, added more to functions
Merge pull request #4 from kcunning/master

Made some updates: Moved indexes, added more to functions