Commit changes done on 6/10/2014

- #177b9e76394fc6eb0cfcc21c8397b55e6ede7af9
- #0d358275c45edc42c664d15cfa3fe88a824fbdbb
- #5e80086c64978266600d7485b287c71fbc3efe66
- #46799c0d15dd0cc6d5337e9d93c7b45b9bb3547e
- #53242b51fe85e6714d59a451eac7dbc0e2b1503c