Fixes #20 Error shows up when i select master style (Replace '1' with 1)
Merge remote-tracking branch 'refs/remotes/origin/stable' into stable