lub 1.0.2 #2

Merged
merged 15 commits into from Apr 4, 2013