Merge pull request #63 from khawkins/unstable_master_merge

Merging unstable into master (prep for 1.5 release)
Merge master back into unstable and change version on unstable
Merge pull request #64 from bhariharan/unstable

Merge master back into unstable and change version on unstable