Master commit 3 from TJ fork

please can you merge these into team's repo
![folder_256](https://f.cloud.github.com/assets/4434026/679321/e9689cc8-d962-11e2-8121-ac7d213a2d28.png)