Merge pull request #9 from anehrkor/master

Production_2014_May_23
Merge remote-tracking branch 'upstream/master'