Merge devel

0.0.2 smartalarm