Add support for Tables and subfigures

![image](https://cloud.githubusercontent.com/assets/253202/3209141/b912b570-ee5d-11e3-95b3-828bfe7b4a2a.png)