RESOLVE #1 I really hope this works with unfuddle successfully!!!
Merge branch 'develop'