rebased from master
master commit 1
MasterCommit_2014_08_21
helvete