Up it to 5
resolve conflict
Merge pull request #6 from EternalGoldenBraid/pr_against_20130815_2

up to 5