Fixes #135 and #136 & some function splitting logic
@@ -1 +1 @@
-Subproject commit 51955525428107d1b146244fd4be40c195e1594f
+Subproject commit a02716798dfc67e0976041e2e7e544da3610c366
Paul