Merged with latest master. #20

Closed dabinett closed 12 years ago