nones
Merge remote-tracking branch 'upstream/master'
 fix index bug
 unsure if this is an index bug
Merge pull request #5 from adamilardi/master

Fixed some bugs?