2nd Jan 2014 Commit 1

- Updated propotions.
- Implemented t-junction.