updated branch / shift
Merge pull request #32 from bdrumheller/working

updated branch / shift