Merge pull request #13 from rhusar/move_master_to_1.3

Move master to 1.3