14OCT13

1359
Merge pull request #5 from rouxz/Charles3

14OCT13