Release 1.3

Bug fix and source cleanup