bu20141210
Merge pull request #37 from solo123/master

bu20141210