bug fixes

Change-Id: I01dc266d3631a6f7a72b005ffd6d927a30b8e122
Signed-off-by: panacotta <alejoar@gmail.com>
Merge branch 'master' of https://github.com/panacotta/papiplot.git

Change-Id: I4d03a9c85e3ef2547e84b08983609cddd502df1d
Signed-off-by: panacotta <alejoar@gmail.com>