Merge pull request #11 from p117/master

BackNode - Pull request 03/27/14
quantum merge
Merge remote-tracking branch 'upstream/master'