issues/804
Merge pull request #808 from monkeyiq/2013sep/issues/804

issues/804